Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 06:23:47 +0000 (23:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 06:23:47 +0000 (23:23 -0700)

Trivial merge